/ SGI Freeware 1999 August / SGI Freeware 1999 August.iso / dist / fw_emacs.idb / usr / freeware / share / emacs / 19.34 / lisp / ediff-ptch.elc.z / ediff-ptch.elc

MacOS 8.1

Win98

DOS

view JSON data

view as text

+--------+-------------------------+-------------------------+--------+--------+
|00000000| 3b 45 4c 43 13 00 00 00 | 0a 3b 3b 3b 20 43 6f 6d |;ELC....|.;;; Com|
|00000010| 70 69 6c 65 64 20 62 79 | 20 72 6d 73 40 65 74 68 |piled by| rms@eth|
|00000020| 61 6e 6f 6c 2e 67 6e 75 | 2e 61 69 2e 6d 69 74 2e |anol.gnu|.ai.mit.|
|00000030| 65 64 75 20 6f 6e 20 54 | 75 65 20 41 75 67 20 32 |edu on T|ue Aug 2|
|00000040| 37 20 31 30 3a 34 32 3a | 33 31 20 31 39 39 36 0a |7 10:42:|31 1996.|
|00000050| 3b 3b 3b 20 66 72 6f 6d | 20 66 69 6c 65 20 2f 68 |;;; from| file /h|
|00000060| 6f 6d 65 2f 66 73 66 2f | 72 6d 73 2f 65 31 39 2f |ome/fsf/|rms/e19/|
|00000070| 6c 69 73 70 2f 65 64 69 | 66 66 2d 70 74 63 68 2e |lisp/edi|ff-ptch.|
|00000080| 65 6c 0a 3b 3b 3b 20 69 | 6e 20 45 6d 61 63 73 20 |el.;;; i|n Emacs |
|00000090| 76 65 72 73 69 6f 6e 20 | 31 39 2e 33 33 2e 34 0a |version |19.33.4.|
|000000a0| 3b 3b 3b 20 77 69 74 68 | 20 62 79 74 65 63 6f 6d |;;; with| bytecom|
|000000b0| 70 20 76 65 72 73 69 6f | 6e 20 32 2e 31 32 0a 3b |p versio|n 2.12.;|
|000000c0| 3b 3b 20 77 69 74 68 20 | 61 6c 6c 20 6f 70 74 69 |;; with |all opti|
|000000d0| 6d 69 7a 61 74 69 6f 6e | 73 2e 0a 3b 3b 3b 20 54 |mization|s..;;; T|
|000000e0| 68 69 73 20 66 69 6c 65 | 20 75 73 65 73 20 6f 70 |his file| uses op|
|000000f0| 63 6f 64 65 73 20 77 68 | 69 63 68 20 64 6f 20 6e |codes wh|ich do n|
|00000100| 6f 74 20 65 78 69 73 74 | 20 69 6e 20 45 6d 61 63 |ot exist| in Emac|
|00000110| 73 20 31 38 2e 0a 0a 28 | 69 66 20 28 61 6e 64 20 |s 18...(|if (and |
|00000120| 28 62 6f 75 6e 64 70 20 | 27 65 6d 61 63 73 2d 76 |(boundp |'emacs-v|
|00000130| 65 72 73 69 6f 6e 29 0a | 09 20 28 6f 72 20 28 61 |ersion).|. (or (a|
|00000140| 6e 64 20 28 62 6f 75 6e | 64 70 20 27 65 70 6f 63 |nd (boun|dp 'epoc|
|00000150| 68 3a 3a 76 65 72 73 69 | 6f 6e 29 20 65 70 6f 63 |h::versi|on) epoc|
|00000160| 68 3a 3a 76 65 72 73 69 | 6f 6e 29 0a 09 20 20 20 |h::versi|on)..   |
|00000170| 20 20 28 73 74 72 69 6e | 67 2d 6c 65 73 73 70 20 |  (strin|g-lessp |
|00000180| 65 6d 61 63 73 2d 76 65 | 72 73 69 6f 6e 20 22 31 |emacs-ve|rsion "1|
|00000190| 39 2e 32 39 22 29 29 29 | 0a 20 20 20 20 28 65 72 |9.29")))|.    (er|
|000001a0| 72 6f 72 20 22 60 65 64 | 69 66 66 2d 70 74 63 68 |ror "`ed|iff-ptch|
|000001b0| 2e 65 6c 27 20 77 61 73 | 20 63 6f 6d 70 69 6c 65 |.el' was| compile|
|000001c0| 64 20 66 6f 72 20 45 6d | 61 63 73 20 31 39 2e 32 |d for Em|acs 19.2|
|000001d0| 39 20 6f 72 20 6c 61 74 | 65 72 22 29 29 0a 0a 0a |9 or lat|er"))...|
|000001e0| 28 72 65 71 75 69 72 65 | 20 28 71 75 6f 74 65 20 |(require| (quote |
|000001f0| 65 64 69 66 66 2d 69 6e | 69 74 29 29 0a 23 40 36 |ediff-in|it)).#@6|
|00000200| 30 20 4c 61 73 74 20 64 | 69 72 65 63 74 6f 72 79 |0 Last d|irectory|
|00000210| 20 75 73 65 64 20 62 79 | 20 61 6e 20 45 64 69 66 | used by| an Edif|
|00000220| 66 20 63 6f 6d 6d 61 6e | 64 20 66 6f 72 20 66 69 |f comman|d for fi|
|00000230| 6c 65 20 74 6f 20 70 61 | 74 63 68 2e 1f 0a 28 64 |le to pa|tch...(d|
|00000240| 65 66 76 61 72 20 65 64 | 69 66 66 2d 6c 61 73 74 |efvar ed|iff-last|
|00000250| 2d 64 69 72 2d 70 61 74 | 63 68 20 6e 69 6c 20 28 |-dir-pat|ch nil (|
|00000260| 23 24 20 2e 20 35 31 34 | 29 29 0a 23 40 34 39 20 |#$ . 514|)).#@49 |
|00000270| 44 65 66 61 75 6c 74 20 | 62 61 63 6b 75 70 20 65 |Default |backup e|
|00000280| 78 74 65 6e 73 69 6f 6e | 20 66 6f 72 20 74 68 65 |xtension| for the|
|00000290| 20 70 61 74 63 68 20 70 | 72 6f 67 72 61 6d 2e 1f | patch p|rogram..|
|000002a0| 0a 28 64 65 66 76 61 72 | 20 65 64 69 66 66 2d 62 |.(defvar| ediff-b|
|000002b0| 61 63 6b 75 70 2d 65 78 | 74 65 6e 73 69 6f 6e 20 |ackup-ex|tension |
|000002c0| 28 62 79 74 65 2d 63 6f | 64 65 20 22 08 c1 3e 83 |(byte-co|de "..>.|
|000002d0| 08 00 c2 87 c3 87 22 20 | 5b 73 79 73 74 65 6d 2d |......" |[system-|
|000002e0| 74 79 70 65 20 28 76 61 | 78 2d 76 6d 73 20 61 78 |type (va|x-vms ax|
|000002f0| 70 2d 76 6d 73 20 65 6d | 78 20 6d 73 2d 64 6f 73 |p-vms em|x ms-dos|
|00000300| 20 77 69 6e 64 6f 77 73 | 2d 6e 74 20 77 69 6e 64 | windows|-nt wind|
|00000310| 6f 77 73 2d 39 35 29 20 | 22 5f 6f 72 69 67 22 20 |ows-95) |"_orig" |
|00000320| 22 2e 6f 72 69 67 22 5d | 20 32 29 20 28 23 24 20 |".orig"]| 2) (#$ |
|00000330| 2e 20 36 32 34 29 29 0a | 23 40 34 31 20 2a 44 65 |. 624)).|#@41 *De|
|00000340| 66 61 75 6c 74 20 64 69 | 72 65 63 74 6f 72 79 20 |fault di|rectory |
|00000350| 74 6f 20 6c 6f 6f 6b 20 | 66 6f 72 20 70 61 74 63 |to look |for patc|
|00000360| 68 65 73 2e 1f 0a 28 64 | 65 66 76 61 72 20 65 64 |hes...(d|efvar ed|
|00000370| 69 66 66 2d 70 61 74 63 | 68 2d 64 65 66 61 75 6c |iff-patc|h-defaul|
|00000380| 74 2d 64 69 72 65 63 74 | 6f 72 79 20 6e 69 6c 20 |t-direct|ory nil |
|00000390| 28 23 24 20 2e 20 2d 38 | 32 39 29 29 0a 23 40 37 |(#$ . -8|29)).#@7|
|000003a0| 31 20 2a 52 65 67 65 78 | 70 20 6d 61 74 63 68 69 |1 *Regex|p matchi|
|000003b0| 6e 67 20 66 69 6c 65 6e | 61 6d 65 20 32 2d 6c 69 |ng filen|ame 2-li|
|000003c0| 6e 65 72 73 20 61 74 20 | 74 68 65 20 73 74 61 72 |ners at |the star|
|000003d0| 74 20 6f 66 20 65 61 63 | 68 20 63 6f 6e 74 65 78 |t of eac|h contex|
|000003e0| 74 20 64 69 66 66 2e 1f | 0a 28 64 65 66 76 61 72 |t diff..|.(defvar|
|000003f0| 20 65 64 69 66 66 2d 63 | 6f 6e 74 65 78 74 2d 64 | ediff-c|ontext-d|
|00000400| 69 66 66 2d 6c 61 62 65 | 6c 2d 72 65 67 65 78 70 |iff-labe|l-regexp|
|00000410| 20 28 63 6f 6e 63 61 74 | 20 22 5c 5c 28 22 20 22 | (concat| "\\(" "|
|00000420| 5e 5c 5c 2a 5c 5c 2a 5c | 5c 2a 20 5c 5c 28 5b 5e |^\\*\\*\|\* \\([^|
|00000430| 20 09 5d 2b 5c 5c 29 5b | 5e 2a 5d 2b 5b 09 20 5d | .]+\\)[|^*]+[. ]|
|00000440| 2a 5c 6e 2d 2d 2d 20 5c | 5c 28 5b 5e 20 09 5d 2b |*\n--- \|\([^ .]+|
|00000450| 5c 5c 29 22 20 22 5c 5c | 7c 22 20 22 5e 2d 2d 2d |\\)" "\\||" "^---|
|00000460| 20 5c 5c 28 5b 5e 20 09 | 5d 2b 5c 5c 29 5b 5e 2d | \\([^ .|]+\\)[^-|
|00000470| 5d 2b 5b 09 20 5d 2a 5c | 6e 5c 5c 2b 5c 5c 2b 5c |]+[. ]*\|n\\+\\+\|
|00000480| 5c 2b 20 5c 5c 28 5b 5e | 20 09 5d 2b 5c 5c 29 22 |\+ \\([^| .]+\\)"|
|00000490| 20 22 5c 5c 29 22 29 20 | 28 23 24 20 2e 20 2d 39 | "\\)") |(#$ . -9|
|000004a0| 33 30 29 29 0a 23 40 34 | 34 20 2a 4e 61 6d 65 20 |30)).#@4|4 *Name |
|000004b0| 6f 66 20 74 68 65 20 70 | 72 6f 67 72 61 6d 20 74 |of the p|rogram t|
|000004c0| 68 61 74 20 61 70 70 6c | 69 65 73 20 70 61 74 63 |hat appl|ies patc|
|000004d0| 68 65 73 2e 1f 0a 28 64 | 65 66 76 61 72 20 65 64 |hes...(d|efvar ed|
|000004e0| 69 66 66 2d 70 61 74 63 | 68 2d 70 72 6f 67 72 61 |iff-patc|h-progra|
|000004f0| 6d 20 22 70 61 74 63 68 | 22 20 28 23 24 20 2e 20 |m "patch|" (#$ . |
|00000500| 2d 31 31 39 34 29 29 0a | 23 40 34 32 20 2a 4f 70 |-1194)).|#@42 *Op|
|00000510| 74 69 6f 6e 73 20 74 6f | 20 70 61 73 73 20 74 6f |tions to| pass to|
|00000520| 20 65 64 69 66 66 2d 70 | 61 74 63 68 2d 70 72 6f | ediff-p|atch-pro|
|00000530| 67 72 61 6d 2e 1f 0a 28 | 64 65 66 76 61 72 20 65 |gram...(|defvar e|
|00000540| 64 69 66 66 2d 70 61 74 | 63 68 2d 6f 70 74 69 6f |diff-pat|ch-optio|
|00000550| 6e 73 20 22 22 20 28 23 | 24 20 2e 20 2d 31 32 39 |ns "" (#|$ . -129|
|00000560| 33 29 29 0a 23 40 32 20 | 1f 0a 28 64 65 66 76 61 |3)).#@2 |..(defva|
|00000570| 72 20 65 64 69 66 66 2d | 70 61 74 63 68 62 75 66 |r ediff-|patchbuf|
|00000580| 65 72 20 6e 69 6c 20 28 | 23 24 20 2e 20 31 33 38 |er nil (|#$ . 138|
|00000590| 34 29 29 0a 28 62 79 74 | 65 2d 63 6f 64 65 20 22 |4)).(byt|e-code "|
|000005a0| c0 c1 21 88 c2 c1 c3 c4 | 23 87 22 20 5b 6d 61 6b |..!.....|#." [mak|
|000005b0| 65 2d 76 61 72 69 61 62 | 6c 65 2d 62 75 66 66 65 |e-variab|le-buffe|
|000005c0| 72 2d 6c 6f 63 61 6c 20 | 65 64 69 66 66 2d 70 61 |r-local |ediff-pa|
|000005d0| 74 63 68 62 75 66 65 72 | 20 70 75 74 20 70 65 72 |tchbufer| put per|
|000005e0| 6d 61 6e 65 6e 74 2d 6c | 6f 63 61 6c 20 74 5d 20 |manent-l|ocal t] |
|000005f0| 34 29 0a 23 40 32 20 1f | 0a 28 64 65 66 76 61 72 |4).#@2 .|.(defvar|
|00000600| 20 65 64 69 66 66 2d 70 | 61 74 63 68 2d 64 69 61 | ediff-p|atch-dia|
|00000610| 67 6e 6f 73 74 69 63 73 | 20 6e 69 6c 20 28 23 24 |gnostics| nil (#$|
|00000620| 20 2e 20 31 35 32 37 29 | 29 0a 28 62 79 74 65 2d | . 1527)|).(byte-|
|00000630| 63 6f 64 65 20 22 c0 c1 | 21 88 c2 c1 c3 c4 23 87 |code "..|!.....#.|
|00000640| 22 20 5b 6d 61 6b 65 2d | 76 61 72 69 61 62 6c 65 |" [make-|variable|
|00000650| 2d 62 75 66 66 65 72 2d | 6c 6f 63 61 6c 20 65 64 |-buffer-|local ed|
|00000660| 69 66 66 2d 70 61 74 63 | 68 2d 64 69 61 67 6e 6f |iff-patc|h-diagno|
|00000670| 73 74 69 63 73 20 70 75 | 74 20 70 65 72 6d 61 6e |stics pu|t perman|
|00000680| 65 6e 74 2d 6c 6f 63 61 | 6c 20 74 5d 20 34 29 0a |ent-loca|l t] 4).|
|00000690| 23 40 32 20 1f 0a 28 64 | 65 66 76 61 72 20 65 64 |#@2 ..(d|efvar ed|
|000006a0| 69 66 66 2d 70 61 74 63 | 68 2d 6d 61 70 20 6e 69 |iff-patc|h-map ni|
|000006b0| 6c 20 28 23 24 20 2e 20 | 31 36 38 34 29 29 0a 28 |l (#$ . |1684)).(|
|000006c0| 62 79 74 65 2d 63 6f 64 | 65 20 22 c0 c1 21 88 c2 |byte-cod|e "..!..|
|000006d0| c1 c3 c4 23 87 22 20 5b | 6d 61 6b 65 2d 76 61 72 |...#." [|make-var|
|000006e0| 69 61 62 6c 65 2d 62 75 | 66 66 65 72 2d 6c 6f 63 |iable-bu|ffer-loc|
|000006f0| 61 6c 20 65 64 69 66 66 | 2d 70 61 74 63 68 2d 6d |al ediff|-patch-m|
|00000700| 61 70 20 70 75 74 20 70 | 65 72 6d 61 6e 65 6e 74 |ap put p|ermanent|
|00000710| 2d 6c 6f 63 61 6c 20 74 | 5d 20 34 29 0a 28 64 65 |-local t|] 4).(de|
|00000720| 66 61 6c 69 61 73 20 27 | 65 64 69 66 66 2d 66 69 |falias '|ediff-fi|
|00000730| 6c 65 2d 6e 61 6d 65 2d | 73 61 6e 73 2d 70 72 65 |le-name-|sans-pre|
|00000740| 66 69 78 20 23 5b 28 66 | 69 6c 65 6e 61 6d 65 20 |fix #[(f|ilename |
|00000750| 70 72 65 66 69 78 29 20 | 22 c0 20 19 c2 8e c3 c4 |prefix) |". .....|
|00000760| 0d 50 0e 06 5c 22 83 18 | 00 0e 06 c7 95 c8 4f 82 |.P..\"..|......O.|
|00000770| 1c 00 c9 0e 06 50 2a 87 | 22 20 5b 6d 61 74 63 68 |.....P*.|" [match|
|00000780| 2d 64 61 74 61 20 6d 61 | 74 63 68 2d 64 61 74 61 |-data ma|tch-data|
|00000790| 20 28 28 73 74 6f 72 65 | 2d 6d 61 74 63 68 2d 64 | ((store|-match-d|
|000007a0| 61 74 61 20 6d 61 74 63 | 68 2d 64 61 74 61 29 29 |ata matc|h-data))|
|000007b0| 20 73 74 72 69 6e 67 2d | 6d 61 74 63 68 20 22 5e | string-|match "^|
|000007c0| 22 20 70 72 65 66 69 78 | 20 66 69 6c 65 6e 61 6d |" prefix| filenam|
|000007d0| 65 20 30 20 6e 69 6c 20 | 22 2f 6e 75 6c 6c 2f 22 |e 0 nil |"/null/"|
|000007e0| 5d 20 33 5d 29 0a 28 70 | 75 74 20 28 71 75 6f 74 |] 3]).(p|ut (quot|
|000007f0| 65 20 65 64 69 66 66 2d | 66 69 6c 65 2d 6e 61 6d |e ediff-|file-nam|
|00000800| 65 2d 73 61 6e 73 2d 70 | 72 65 66 69 78 29 20 28 |e-sans-p|refix) (|
|00000810| 71 75 6f 74 65 20 62 79 | 74 65 2d 6f 70 74 69 6d |quote by|te-optim|
|00000820| 69 7a 65 72 29 20 28 71 | 75 6f 74 65 20 62 79 74 |izer) (q|uote byt|
|00000830| 65 2d 63 6f 6d 70 69 6c | 65 2d 69 6e 6c 69 6e 65 |e-compil|e-inline|
|00000840| 2d 65 78 70 61 6e 64 29 | 29 0a 28 64 65 66 61 6c |-expand)|).(defal|
|00000850| 69 61 73 20 27 65 64 69 | 66 66 2d 63 6f 75 6e 74 |ias 'edi|ff-count|
|00000860| 2d 6d 61 74 63 68 65 73 | 20 23 5b 28 72 65 67 65 |-matches| #[(rege|
|00000870| 78 70 20 62 75 66 29 20 | 22 70 18 09 83 4f 00 c2 |xp buf) |"p...O..|
|00000880| 09 21 83 4f 00 c3 c2 09 | 21 21 83 4f 00 c4 8e 09 |.!.O....|!!.O....|
|00000890| 71 88 c5 c6 1e 07 1e 08 | 8a 65 62 88 6d 84 48 00 |q.......|.eb.m.H.|
|000008a0| 60 16 07 c9 0e 5c 6e c6 | cb 23 83 48 00 0e 07 60 |`....\n.|.#.H...`|
|000008b0| 55 83 40 00 cc 75 88 82 | 23 00 0e 08 54 16 08 82 |U.@..u..|#...T...|
|000008c0| 23 00 29 0e 08 2b 82 5a | 00 0e 0d ce 3d 86 5a 00 |#.)..+.Z|....=.Z.|
|000008d0| cf 0e 10 21 29 87 22 20 | 5b 53 74 61 72 74 42 75 |...!)." |[StartBu|
|000008e0| 66 66 65 72 20 62 75 66 | 20 67 65 74 2d 62 75 66 |ffer buf| get-buf|
|000008f0| 66 65 72 20 62 75 66 66 | 65 72 2d 6e 61 6d 65 20 |fer buff|er-name |
|00000900| 28 28 73 65 74 2d 62 75 | 66 66 65 72 20 53 74 61 |((set-bu|ffer Sta|
|00000910| 72 74 42 75 66 66 65 72 | 29 29 20 30 20 6e 69 6c |rtBuffer|)) 0 nil|
|00000920| 20 6f 70 6f 69 6e 74 20 | 63 6f 75 6e 74 20 72 65 | opoint |count re|
|00000930| 2d 73 65 61 72 63 68 2d | 66 6f 72 77 61 72 64 20 |-search-|forward |
|00000940| 72 65 67 65 78 70 20 74 | 20 31 20 74 68 69 73 2d |regexp t| 1 this-|
|00000950| 63 6f 6d 6d 61 6e 64 20 | 65 64 69 66 66 2d 71 75 |command |ediff-qu|
|00000960| 69 74 20 65 72 72 6f 72 | 20 65 64 69 66 66 2d 4b |it error| ediff-K|
|00000970| 49 4c 4c 45 44 2d 56 49 | 54 41 4c 2d 42 55 46 46 |ILLED-VI|TAL-BUFF|
|00000980| 45 52 5d 20 34 5d 29 0a | 28 64 65 66 61 6c 69 61 |ER] 4]).|(defalia|
|00000990| 73 20 27 65 64 69 66 66 | 2d 6d 61 70 2d 70 61 74 |s 'ediff|-map-pat|
|000009a0| 63 68 2d 62 75 66 66 65 | 72 20 23 5b 28 62 75 66 |ch-buffe|r #[(buf|
|000009b0| 29 20 22 70 18 09 83 12 | 01 c2 09 21 83 12 01 c3 |) "p....|...!....|
|000009c0| c2 09 21 21 83 12 01 c4 | 8e 09 71 88 c5 c6 20 65 |..!!....|..q... e|
|000009d0| c7 93 65 c8 c7 89 89 89 | 89 89 89 89 89 1e 09 1e |..e.....|........|
|000009e0| 5c 6e 1e 0b 1e 5c 66 1e | 0d 1e 0e 1e 0f 1e 10 1e |\n...\f.|........|
|000009f0| 11 1e 12 1e 13 1e 14 1e | 15 8a 65 62 88 60 16 09 |........|..eb.`..|
|00000a00| 6d 84 f6 00 d6 0e 17 c7 | d8 23 83 f6 00 0e 09 60 |m.......|.#.....`|
|00000a10| 55 83 65 00 d9 75 88 82 | eb 00 c6 20 c5 94 c7 93 |U.e..u..|... ....|
|00000a20| 16 10 c5 95 16 11 da 94 | 16 0e da 95 16 5c 66 db |........|.....\f.|
|00000a30| 94 16 0d db 95 16 0b 0e | 0e 83 93 00 0e 5c 66 83 |........|.....\f.|
|00000a40| 93 00 0e 0e 0e 5c 66 7b | 82 94 00 dc 0e 0d 83 a6 |.....\f{|........|
|00000a50| 00 0e 0b 83 a6 00 0e 0d | 0e 0b 7b 82 a7 00 dc 42 |........|..{....B|
|00000a60| 16 12 dd de 0e 13 df 23 | 83 ba 00 0e 10 c5 94 c7 |.......#|........|
|00000a70| 93 88 dd e0 0e 13 df 23 | 83 ca 00 0e 10 c5 94 c7 |.......#|........|
|00000a80| 93 88 0e 11 62 88 0e 0f | 83 df 00 0e 0f 0e 14 0e |....b...|........|
|00000a90| 10 45 0e 5c 6e 42 16 5c | 6e 0e 10 16 14 0e 11 16 |.E.\nB.\|n.......|
|00000aa0| 13 0e 12 16 0f 60 16 09 | 0e 15 54 16 15 82 4b 00 |.....`..|..T...K.|
|00000ab0| 29 e1 20 16 10 0e 12 0e | 14 0e 10 45 0e 5c 6e 42 |). .....|...E.\nB|
|00000ac0| 89 16 5c 6e 9f 16 5c 22 | 0e 15 2e 0e 82 1d 01 0e |..\n..\"|........|
|00000ad0| 23 e4 3d 86 1d 01 e5 0e | 26 21 29 87 22 20 5b 53 |#.=.....|&!)." [S|
|00000ae0| 74 61 72 74 42 75 66 66 | 65 72 20 62 75 66 20 67 |tartBuff|er buf g|
|00000af0| 65 74 2d 62 75 66 66 65 | 72 20 62 75 66 66 65 72 |et-buffe|r buffer|
|00000b00| 2d 6e 61 6d 65 20 28 28 | 73 65 74 2d 62 75 66 66 |-name ((|set-buff|
|00000b10| 65 72 20 53 74 61 72 74 | 42 75 66 66 65 72 29 29 |er Start|Buffer))|
|00000b20| 20 30 20 6d 61 6b 65 2d | 6d 61 72 6b 65 72 20 6e | 0 make-|marker n|
|00000b30| 69 6c 20 28 22 2f 64 65 | 76 2f 6e 75 6c 6c 22 20 |il ("/de|v/null" |
|00000b40| 2e 20 22 2f 64 65 76 2f | 6e 75 6c 6c 22 29 20 6f |. "/dev/|null") o|
|00000b50| 70 6f 69 6e 74 20 70 61 | 74 63 68 2d 6d 61 70 20 |point pa|tch-map |
|00000b60| 65 6e 64 32 20 65 6e 64 | 31 20 62 65 67 32 20 62 |end2 end|1 beg2 b|
|00000b70| 65 67 31 20 66 69 6c 65 | 6e 61 6d 65 73 20 6d 61 |eg1 file|names ma|
|00000b80| 72 6b 32 20 6d 61 72 6b | 32 2d 65 6e 64 20 70 6f |rk2 mark|2-end po|
|00000b90| 73 73 69 62 6c 65 2d 66 | 69 6c 65 2d 6e 61 6d 65 |ssible-f|ile-name|
|00000ba0| 73 20 6d 61 72 6b 31 2d | 65 6e 64 20 6d 61 72 6b |s mark1-|end mark|
|00000bb0| 31 20 63 6f 75 6e 74 20 | 72 65 2d 73 65 61 72 63 |1 count |re-searc|
|00000bc0| 68 2d 66 6f 72 77 61 72 | 64 20 65 64 69 66 66 2d |h-forwar|d ediff-|
|00000bd0| 63 6f 6e 74 65 78 74 2d | 64 69 66 66 2d 6c 61 62 |context-|diff-lab|
|00000be0| 65 6c 2d 72 65 67 65 78 | 70 20 74 20 31 20 32 20 |el-regex|p t 1 2 |
|00000bf0| 33 20 22 2f 64 65 76 2f | 6e 75 6c 6c 22 20 72 65 |3 "/dev/|null" re|
|00000c00| 2d 73 65 61 72 63 68 2d | 62 61 63 6b 77 61 72 64 |-search-|backward|
|00000c10| 20 22 5e 49 6e 64 65 78 | 3a 22 20 6e 6f 65 72 72 | "^Index|:" noerr|
|00000c20| 6f 72 20 22 5e 50 72 65 | 72 65 71 3a 22 20 70 6f |or "^Pre|req:" po|
|00000c30| 69 6e 74 2d 6d 61 78 2d | 6d 61 72 6b 65 72 20 65 |int-max-|marker e|
|00000c40| 64 69 66 66 2d 70 61 74 | 63 68 2d 6d 61 70 20 74 |diff-pat|ch-map t|
|00000c50| 68 69 73 2d 63 6f 6d 6d | 61 6e 64 20 65 64 69 66 |his-comm|and edif|
|00000c60| 66 2d 71 75 69 74 20 65 | 72 72 6f 72 20 65 64 69 |f-quit e|rror edi|
|00000c70| 66 66 2d 4b 49 4c 4c 45 | 44 2d 56 49 54 41 4c 2d |ff-KILLE|D-VITAL-|
|00000c80| 42 55 46 46 45 52 5d 20 | 31 34 5d 29 0a 28 64 65 |BUFFER] |14]).(de|
|00000c90| 66 61 6c 69 61 73 20 27 | 65 64 69 66 66 2d 66 69 |falias '|ediff-fi|
|00000ca0| 78 75 70 2d 70 61 74 63 | 68 2d 6d 61 70 20 23 5b |xup-patc|h-map #[|
|00000cb0| 28 66 69 6c 65 6e 61 6d | 65 29 20 22 c0 09 21 11 |(filenam|e) "..!.|
|00000cc0| c2 09 21 83 10 00 c3 09 | 21 82 13 00 c4 09 21 c4 |..!.....|!.....!.|
|00000cd0| 0d 40 40 40 21 c4 0d 40 | 40 41 21 1e 06 1e 07 1e |.@@@!..@|@A!.....|
|00000ce0| 08 c9 ca 0d 5c 22 88 c2 | 09 21 84 41 00 cb 09 98 |....\"..|.!.A....|
|00000cf0| 84 41 00 0d 40 cc 09 21 | cc 09 21 42 a0 88 c9 cd |.A..@..!|..!B....|
|00000d00| 0d 5c 22 88 c9 ce 0d 5c | 22 2b 87 22 20 5b 65 78 |.\"....\|"+." [ex|
|00000d10| 70 61 6e 64 2d 66 69 6c | 65 2d 6e 61 6d 65 20 66 |pand-fil|e-name f|
|00000d20| 69 6c 65 6e 61 6d 65 20 | 66 69 6c 65 2d 64 69 72 |ilename |file-dir|
|00000d30| 65 63 74 6f 72 79 2d 70 | 20 66 69 6c 65 2d 6e 61 |ectory-p| file-na|
|00000d40| 6d 65 2d 61 73 2d 64 69 | 72 65 63 74 6f 72 79 20 |me-as-di|rectory |
|00000d50| 66 69 6c 65 2d 6e 61 6d | 65 2d 64 69 72 65 63 74 |file-nam|e-direct|
|00000d60| 6f 72 79 20 65 64 69 66 | 66 2d 70 61 74 63 68 2d |ory edif|f-patch-|
|00000d70| 6d 61 70 20 62 61 73 65 | 2d 64 69 72 32 20 62 61 |map base|-dir2 ba|
|00000d80| 73 65 2d 64 69 72 31 20 | 61 63 74 75 61 6c 2d 64 |se-dir1 |actual-d|
|00000d90| 69 72 20 6d 61 70 63 61 | 72 20 23 5b 28 74 72 69 |ir mapca|r #[(tri|
|00000da0| 70 6c 65 29 20 22 08 40 | 40 c1 98 84 2d 00 08 40 |ple) ".@|@...-..@|
|00000db0| 08 40 40 5c 6e 1b 1c c5 | 20 1e 06 c7 8e c8 c9 0b |.@@\n...| .......|
|00000dc0| 50 5c 66 5c 22 83 27 00 | 5c 66 ca 95 cb 4f 82 2a |P\f\".'.|\f...O.*|
|00000dd0| 00 cc 5c 66 50 2c a0 88 | 08 40 41 c1 98 86 5a 00 |..\fP,..|.@A...Z.|
|00000de0| 08 40 08 40 41 0e 0d 1b | 1c c5 20 1e 06 c7 8e c8 |.@.@A...|.. .....|
|00000df0| c9 0b 50 5c 66 5c 22 83 | 55 00 5c 66 ca 95 cb 4f |..P\f\".|U.\f...O|
|00000e00| 82 58 00 cc 5c 66 50 2c | a1 87 22 20 5b 74 72 69 |.X..\fP,|.." [tri|
|00000e10| 70 6c 65 20 22 2f 64 65 | 76 2f 6e 75 6c 6c 22 20 |ple "/de|v/null" |
|00000e20| 62 61 73 65 2d 64 69 72 | 31 20 70 72 65 66 69 78 |base-dir|1 prefix|
|00000e30| 20 66 69 6c 65 6e 61 6d | 65 20 6d 61 74 63 68 2d | filenam|e match-|
|00000e40| 64 61 74 61 20 6d 61 74 | 63 68 2d 64 61 74 61 20 |data mat|ch-data |
|00000e50| 28 28 73 74 6f 72 65 2d | 6d 61 74 63 68 2d 64 61 |((store-|match-da|
|00000e60| 74 61 20 6d 61 74 63 68 | 2d 64 61 74 61 29 29 20 |ta match|-data)) |
|00000e70| 73 74 72 69 6e 67 2d 6d | 61 74 63 68 20 22 5e 22 |string-m|atch "^"|
|00000e80| 20 30 20 6e 69 6c 20 22 | 2f 6e 75 6c 6c 2f 22 20 | 0 nil "|/null/" |
|00000e90| 62 61 73 65 2d 64 69 72 | 32 5d 20 34 5d 20 22 2f |base-dir|2] 4] "/|
|00000ea0| 64 65 76 2f 6e 75 6c 6c | 22 20 66 69 6c 65 2d 6e |dev/null|" file-n|
|00000eb0| 61 6d 65 2d 6e 6f 6e 64 | 69 72 65 63 74 6f 72 79 |ame-nond|irectory|
|00000ec0| 20 23 5b 28 74 72 69 70 | 6c 65 29 20 22 c0 c1 5c | #[(trip|le) "..\|
|00000ed0| 6e 40 40 5c 22 83 64 00 | c0 c1 5c 6e 40 41 5c 22 |n@@\".d.|..\n@A\"|
|00000ee0| 83 64 00 0b 90 c4 c5 c6 | 5c 6e 40 40 c7 c8 4f 5c |.d......|\n@@..O\|
|00000ef0| 6e 40 41 c7 c8 4f 23 21 | 91 88 c9 c8 1e 5c 6e 1e |n@A..O#!|.....\n.|
|00000f00| 0b 0e 0b 83 5c 5c 00 cc | cd 0e 0e 89 c9 24 16 5c |....\\..|.....$.\|
|00000f10| 6e cf 0e 5c 6e 21 84 49 | 00 c8 89 16 0b 82 2f 00 |n..\n!.I|....../.|
|00000f20| c9 16 0b d0 20 88 d1 d2 | 0e 5c 6e 5c 22 88 d3 d4 |.... ...|.\n\"...|
|00000f30| 21 88 82 2d 00 5c 6e 0e | 5c 6e 89 42 a0 2a 87 5c |!..-.\n.|\n.B.*.\|
|00000f40| 6e 40 d5 0e 0e 5c 6e 40 | 40 50 21 a0 88 5c 6e 40 |n@...\n@|@P!..\n@|
|00000f50| d5 0e 0e 5c 6e 40 41 50 | 21 a1 87 22 20 5b 73 74 |...\n@AP|!.." [st|
|00000f60| 72 69 6e 67 2d 6d 61 74 | 63 68 20 22 5e 2f 6e 75 |ring-mat|ch "^/nu|
|00000f70| 6c 6c 2f 22 20 74 72 69 | 70 6c 65 20 65 64 69 66 |ll/" tri|ple edif|
|00000f80| 66 2d 6d 73 67 2d 62 75 | 66 66 65 72 20 70 72 69 |f-msg-bu|ffer pri|
|00000f90| 6e 63 20 66 6f 72 6d 61 | 74 20 22 5c 6e 54 68 65 |nc forma|t "\nThe|
|00000fa0| 20 70 61 74 63 68 20 66 | 69 6c 65 20 63 6f 6e 74 | patch f|ile cont|
|00000fb0| 61 69 6e 73 20 61 20 63 | 6f 6e 74 65 78 74 20 64 |ains a c|ontext d|
|00000fc0| 69 66 66 20 66 6f 72 5c | 6e 09 25 73 5c 6e 09 25 |iff for\|n.%s\n.%|
|00000fd0| 73 5c 6e 5c 6e 48 6f 77 | 65 76 65 72 2c 20 45 64 |s\n\nHow|ever, Ed|
|00000fe0| 69 66 66 20 63 61 6e 6e | 6f 74 20 69 6e 66 65 72 |iff cann|ot infer|
|00000ff0| 20 74 68 65 20 6e 61 6d | 65 20 6f 66 20 74 68 65 | the nam|e of the|
|00001000| 20 61 63 74 75 61 6c 20 | 66 69 6c 65 5c 6e 74 6f | actual |file\nto|
|00001010| 20 62 65 20 70 61 74 63 | 68 65 64 20 6f 6e 20 79 | be patc|hed on y|
|00001020| 6f 75 72 20 73 79 73 74 | 65 6d 2e 20 49 66 20 79 |our syst|em. If y|
|00001030| 6f 75 20 6b 6e 6f 77 20 | 74 68 65 20 63 6f 72 72 |ou know |the corr|
|00001040| 65 63 74 20 66 69 6c 65 | 20 6e 61 6d 65 2c 5c 6e |ect file| name,\n|
|00001050| 70 6c 65 61 73 65 20 65 | 6e 74 65 72 20 69 74 20 |please e|nter it |
|00001060| 6e 6f 77 2e 5c 6e 5c 6e | 49 66 20 79 6f 75 20 64 |now.\n\n|If you d|
|00001070| 6f 6e 27 74 20 6b 6e 6f | 77 20 61 6e 64 20 73 74 |on't kno|w and st|
|00001080| 69 6c 6c 20 77 6f 75 6c | 64 20 6c 69 6b 65 20 74 |ill woul|d like t|
|00001090| 6f 20 61 70 70 6c 79 20 | 70 61 74 63 68 65 73 20 |o apply |patches |
|000010a0| 74 6f 5c 6e 6f 74 68 65 | 72 20 66 69 6c 65 73 2c |to\nothe|r files,|
|000010b0| 20 65 6e 74 65 72 20 2f | 64 65 76 2f 6e 75 6c 6c | enter /|dev/null|
|000010c0| 5c 6e 22 20 36 20 6e 69 | 6c 20 74 20 75 73 65 72 |\n" 6 ni|l t user|
|000010d0| 2d 66 69 6c 65 20 64 69 | 72 65 63 74 6f 72 79 20 |-file di|rectory |
|000010e0| 72 65 61 64 2d 66 69 6c | 65 2d 6e 61 6d 65 20 22 |read-fil|e-name "|
|000010f0| 50 6c 65 61 73 65 20 65 | 6e 74 65 72 20 66 69 6c |Please e|nter fil|
|00001100| 65 20 6e 61 6d 65 3a 20 | 22 20 61 63 74 75 61 6c |e name: |" actual|
|00001110| 2d 64 69 72 20 66 69 6c | 65 2d 64 69 72 65 63 74 |-dir fil|e-direct|
|00001120| 6f 72 79 2d 70 20 62 65 | 65 70 20 6d 65 73 73 61 |ory-p be|ep messa|
|00001130| 67 65 20 22 25 73 20 69 | 73 20 61 20 64 69 72 65 |ge "%s i|s a dire|
|00001140| 63 74 6f 72 79 22 20 73 | 69 74 2d 66 6f 72 20 32 |ctory" s|it-for 2|
|00001150| 20 65 78 70 61 6e 64 2d | 66 69 6c 65 2d 6e 61 6d | expand-|file-nam|
|00001160| 65 5d 20 39 5d 20 23 5b | 28 74 72 69 70 6c 65 29 |e] 9] #[|(triple)|
|00001170| 20 22 08 40 40 19 08 40 | 41 1a c3 09 21 1c c3 5c | ".@@..@|A...!..\|
|00001180| 6e 21 1d 5c 6e 47 09 47 | 57 83 5c 22 00 0d 83 5c |n!.\nG.G|W.\"...\|
|00001190| 22 00 08 5c 6e a0 82 c8 | 00 09 47 5c 6e 47 57 83 |"..\n...|..G\nGW.|
|000011a0| 34 00 5c 66 83 34 00 08 | 09 a0 82 c8 00 5c 66 83 |4.\f.4..|.....\f.|
|000011b0| 48 00 0d 83 48 00 09 5c | 6e 98 83 48 00 08 09 a0 |H...H..\|n..H....|
|000011c0| 82 c8 00 5c 66 83 71 00 | 0d 83 71 00 0e 06 90 c7 |...\f.q.|..q.....|
|000011d0| c8 c9 09 5c 6e 89 09 25 | 21 91 88 08 ca c8 cb 5c |...\n..%|!......\|
|000011e0| 6e 5c 22 21 83 6c 00 5c | 6e 82 6d 00 09 a0 82 c8 |n\"!.l.\|n.m.....|
|000011f0| 00 0d 83 7b 00 08 5c 6e | a0 82 c8 00 5c 66 83 85 |...{..\n|....\f..|
|00001200| 00 08 09 a0 82 c8 00 0e | 06 90 c7 c8 cc 09 5c 6e |........|......\n|
|00001210| 23 21 91 88 cd ce 1e 0f | 1e 10 0e 10 83 c3 00 d1 |#!......|........|
|00001220| d2 0e 13 89 cd 24 16 0f | d4 0e 0f 21 84 b3 00 ce |.....$..|...!....|
|00001230| 89 16 10 82 99 00 d5 20 | 88 d6 d7 0e 0f 5c 22 88 |....... |.....\".|
|00001240| d8 d9 21 88 82 97 00 08 | 0e 0f a0 2a 2c 87 22 20 |..!.....|...*,." |
|00001250| 5b 74 72 69 70 6c 65 20 | 66 69 6c 65 31 20 66 69 |[triple |file1 fi|
|00001260| 6c 65 32 20 66 69 6c 65 | 2d 65 78 69 73 74 73 2d |le2 file|-exists-|
|00001270| 70 20 66 31 2d 65 78 69 | 73 74 73 20 66 32 2d 65 |p f1-exi|sts f2-e|
|00001280| 78 69 73 74 73 20 65 64 | 69 66 66 2d 6d 73 67 2d |xists ed|iff-msg-|
|00001290| 62 75 66 66 65 72 20 70 | 72 69 6e 63 20 66 6f 72 |buffer p|rinc for|
|000012a0| 6d 61 74 20 22 5c 6e 45 | 64 69 66 66 20 68 61 73 |mat "\nE|diff has|
|000012b0| 20 69 6e 66 65 72 72 65 | 64 20 74 68 61 74 5c 6e | inferre|d that\n|
|000012c0| 09 25 73 5c 6e 09 25 73 | 5c 6e 61 72 65 20 70 6f |.%s\n.%s|\nare po|
|000012d0| 73 73 69 62 6c 65 20 74 | 61 72 67 65 74 73 20 66 |ssible t|argets f|
|000012e0| 6f 72 20 61 70 70 6c 79 | 69 6e 67 20 74 68 65 20 |or apply|ing the |
|000012f0| 70 61 74 63 68 2e 5c 6e | 42 6f 74 68 20 66 69 6c |patch.\n|Both fil|
|00001300| 65 73 20 73 65 65 6d 20 | 74 6f 20 62 65 20 70 6c |es seem |to be pl|
|00001310| 61 75 73 69 62 6c 65 20 | 61 6c 74 65 72 6e 61 74 |ausible |alternat|
|00001320| 69 76 65 73 2e 5c 6e 5c | 6e 50 6c 65 61 73 65 20 |ives.\n\|nPlease |
|00001330| 61 64 76 69 63 65 3a 5c | 6e 20 20 20 20 54 79 70 |advice:\|n    Typ|
|00001340| 65 20 60 79 27 20 74 6f | 20 75 73 65 20 25 73 20 |e `y' to| use %s |
|00001350| 61 73 20 74 68 65 20 74 | 61 72 67 65 74 3b 5c 6e |as the t|arget;\n|
|00001360| 20 20 20 20 54 79 70 65 | 20 60 6e 27 20 74 6f 20 |    Type| `n' to |
|00001370| 75 73 65 20 25 73 20 61 | 73 20 74 68 65 20 74 61 |use %s a|s the ta|
|00001380| 72 67 65 74 2e 5c 6e 22 | 20 79 2d 6f 72 2d 6e 2d |rget.\n"| y-or-n-|
|00001390| 70 20 22 55 73 65 20 25 | 73 20 3f 20 22 20 22 5c |p "Use %|s ? " "\|
|000013a0| 6e 45 64 69 66 66 20 69 | 6e 66 65 72 72 65 64 20 |nEdiff i|nferred |
|000013b0| 74 68 61 74 20 5c 6e 09 | 25 73 5c 6e 09 25 73 5c |that \n.|%s\n.%s\|
|000013c0| 6e 61 72 65 20 70 6f 73 | 73 69 62 6c 65 20 61 6c |nare pos|sible al|
|000013d0| 74 65 72 6e 61 74 69 76 | 65 20 74 61 72 67 65 74 |ternativ|e target|
|000013e0| 73 20 66 6f 72 20 74 68 | 69 73 20 70 61 74 63 68 |s for th|is patch|
|000013f0| 2e 5c 6e 5c 6e 48 6f 77 | 65 76 65 72 2c 20 74 68 |.\n\nHow|ever, th|
|00001400| 65 73 65 20 66 69 6c 65 | 73 20 64 6f 20 6e 6f 74 |ese file|s do not|
|00001410| 20 65 78 69 73 74 2e 5c | 6e 5c 6e 50 6c 65 61 73 | exist.\|n\nPleas|
|00001420| 65 20 65 6e 74 65 72 20 | 61 6e 20 61 6c 74 65 72 |e enter |an alter|
|00001430| 6e 61 74 69 76 65 20 70 | 61 74 63 68 20 74 61 72 |native p|atch tar|
|00001440| 67 65 74 20 2e 2e 2e 20 | 5c 6e 22 20 74 20 6e 69 |get ... |\n" t ni|
|00001450| 6c 20 74 61 72 67 65 74 | 20 64 69 72 65 63 74 6f |l target| directo|
|00001460| 72 79 20 72 65 61 64 2d | 66 69 6c 65 2d 6e 61 6d |ry read-|file-nam|
|00001470| 65 20 22 50 6c 65 61 73 | 65 20 65 6e 74 65 72 20 |e "Pleas|e enter |
|00001480| 61 20 70 61 74 63 68 20 | 74 61 72 67 65 74 3a 20 |a patch |target: |
|00001490| 22 20 61 63 74 75 61 6c | 2d 64 69 72 20 66 69 6c |" actual|-dir fil|
|000014a0| 65 2d 64 69 72 65 63 74 | 6f 72 79 2d 70 20 62 65 |e-direct|ory-p be|
|000014b0| 65 70 20 6d 65 73 73 61 | 67 65 20 22 25 73 20 69 |ep messa|ge "%s i|
|000014c0| 73 20 61 20 64 69 72 65 | 63 74 6f 72 79 22 20 73 |s a dire|ctory" s|
|000014d0| 69 74 2d 66 6f 72 20 32 | 5d 20 39 5d 5d 20 34 5d |it-for 2|] 9]] 4]|
|000014e0| 29 0a 28 64 65 66 61 6c | 69 61 73 20 27 65 64 69 |).(defal|ias 'edi|
|000014f0| 66 66 2d 73 68 6f 77 2d | 70 61 74 63 68 2d 64 69 |ff-show-|patch-di|
|00001500| 61 67 6e 6f 73 74 69 63 | 73 20 23 5b 6e 69 6c 20 |agnostic|s #[nil |
|00001510| 22 c0 09 21 83 0b 00 c2 | 09 0b 5c 22 87 c0 5c 66 |"..!....|..\"..\f|
|00001520| 21 83 16 00 c2 5c 66 0b | 5c 22 87 c5 0b c6 5c 22 |!....\f.|\"....\"|
|00001530| 87 22 20 5b 77 69 6e 64 | 6f 77 2d 6c 69 76 65 2d |." [wind|ow-live-|
|00001540| 70 20 65 64 69 66 66 2d | 77 69 6e 64 6f 77 2d 41 |p ediff-|window-A|
|00001550| 20 73 65 74 2d 77 69 6e | 64 6f 77 2d 62 75 66 66 | set-win|dow-buff|
|00001560| 65 72 20 65 64 69 66 66 | 2d 70 61 74 63 68 2d 64 |er ediff|-patch-d|
|00001570| 69 61 67 6e 6f 73 74 69 | 63 73 20 65 64 69 66 66 |iagnosti|cs ediff|
|00001580| 2d 77 69 6e 64 6f 77 2d | 42 20 64 69 73 70 6c 61 |-window-|B displa|
|00001590| 79 2d 62 75 66 66 65 72 | 20 6e 6f 74 2d 74 68 69 |y-buffer| not-thi|
|000015a0| 73 2d 77 69 6e 64 6f 77 | 5d 20 33 20 6e 69 6c 20 |s-window|] 3 nil |
|000015b0| 6e 69 6c 5d 29 0a 23 40 | 31 30 36 20 4f 62 74 61 |nil]).#@|106 Obta|
|000015c0| 69 6e 20 70 61 74 63 68 | 20 62 75 66 66 65 72 2e |in patch| buffer.|
|000015d0| 20 20 49 66 20 70 61 74 | 63 68 20 69 73 20 61 6c |  If pat|ch is al|
|000015e0| 72 65 61 64 79 20 69 6e | 20 61 20 62 75 66 66 65 |ready in| a buffe|
|000015f0| 72 2d 2d 2d 75 73 65 20 | 69 74 2e 0a 45 6c 73 65 |r---use |it..Else|
|00001600| 2c 20 72 65 61 64 20 70 | 61 74 63 68 20 66 69 6c |, read p|atch fil|
|00001610| 65 20 69 6e 74 6f 20 61 | 20 6e 65 77 20 62 75 66 |e into a| new buf|
|00001620| 66 65 72 2e 1f 0a 28 64 | 65 66 61 6c 69 61 73 20 |fer...(d|efalias |
|00001630| 27 65 64 69 66 66 2d 67 | 65 74 2d 70 61 74 63 68 |'ediff-g|et-patch|
|00001640| 2d 62 75 66 66 65 72 20 | 23 5b 6e 69 6c 20 22 08 |-buffer |#[nil ".|
|00001650| 86 0d 00 09 83 5c 66 00 | 5c 6e 82 0d 00 0b c4 1d |.....\f.|\n......|
|00001660| 1e 06 c7 c8 21 83 5c 22 | 00 c9 ca cb 70 cc 23 21 |....!.\"|....p.#!|
|00001670| 15 82 2a 00 cd ce cf 0e | 06 5c 22 21 15 70 1e 10 |..*.....|.\"!.p..|
|00001680| 0d 83 5b 00 c9 0d 21 83 | 5b 00 d1 c9 0d 21 21 83 |..[...!.|[....!!.|
|00001690| 5b 00 d2 8e 0d 71 88 65 | 62 88 d3 0d 21 84 57 00 |[....q.e|b...!.W.|
|000016a0| d4 0d d5 5c 22 88 d6 d7 | 20 21 88 29 82 67 00 0e |...\"...| !.).g..|
|000016b0| 18 d9 3d 84 67 00 da 0e | 1b 21 88 29 dc 0d 21 88 |..=.g...|.!.)..!.|
|000016c0| 0d 2a 87 22 20 5b 65 64 | 69 66 66 2d 70 61 74 63 |.*." [ed|iff-patc|
|000016d0| 68 2d 64 65 66 61 75 6c | 74 2d 64 69 72 65 63 74 |h-defaul|t-direct|
|000016e0| 6f 72 79 20 65 64 69 66 | 66 2d 75 73 65 2d 6c 61 |ory edif|f-use-la|
|000016f0| 73 74 2d 64 69 72 20 65 | 64 69 66 66 2d 6c 61 73 |st-dir e|diff-las|
|00001700| 74 2d 64 69 72 2d 70 61 | 74 63 68 20 64 65 66 61 |t-dir-pa|tch defa|
|00001710| 75 6c 74 2d 64 69 72 65 | 63 74 6f 72 79 20 6e 69 |ult-dire|ctory ni|
|00001720| 6c 20 70 61 74 63 68 2d | 62 75 66 20 64 69 72 20 |l patch-|buf dir |
|00001730| 79 2d 6f 72 2d 6e 2d 70 | 20 22 49 73 20 74 68 65 |y-or-n-p| "Is the|
|00001740| 20 70 61 74 63 68 20 61 | 6c 72 65 61 64 79 20 69 | patch a|lready i|
|00001750| 6e 20 61 20 62 75 66 66 | 65 72 3f 20 22 20 67 65 |n a buff|er? " ge|
|00001760| 74 2d 62 75 66 66 65 72 | 20 72 65 61 64 2d 62 75 |t-buffer| read-bu|
|00001770| 66 66 65 72 20 22 57 68 | 69 63 68 20 62 75 66 66 |ffer "Wh|ich buff|
|00001780| 65 72 20 63 6f 6e 74 61 | 69 6e 73 20 74 68 65 20 |er conta|ins the |
|00001790| 70 61 74 63 68 3f 20 22 | 20 6d 75 73 74 2d 6d 61 |patch? "| must-ma|
|000017a0| 74 63 68 20 66 69 6e 64 | 2d 66 69 6c 65 2d 6e 6f |tch find|-file-no|
|000017b0| 73 65 6c 65 63 74 20 72 | 65 61 64 2d 66 69 6c 65 |select r|ead-file|
|000017c0| 2d 6e 61 6d 65 20 22 57 | 68 69 63 68 20 66 69 6c |-name "W|hich fil|
|000017d0| 65 20 63 6f 6e 74 61 69 | 6e 73 20 74 68 65 20 70 |e contai|ns the p|
|000017e0| 61 74 63 68 3f 20 22 20 | 53 74 61 72 74 42 75 66 |atch? " |StartBuf|
|000017f0| 66 65 72 20 62 75 66 66 | 65 72 2d 6e 61 6d 65 20 |fer buff|er-name |
|00001800| 28 28 73 65 74 2d 62 75 | 66 66 65 72 20 53 74 61 |((set-bu|ffer Sta|
|00001810| 72 74 42 75 66 66 65 72 | 29 29 20 65 64 69 66 66 |rtBuffer|)) ediff|
|00001820| 2d 67 65 74 2d 76 69 73 | 69 62 6c 65 2d 62 75 66 |-get-vis|ible-buf|
|00001830| 66 65 72 2d 77 69 6e 64 | 6f 77 20 70 6f 70 2d 74 |fer-wind|ow pop-t|
|00001840| 6f 2d 62 75 66 66 65 72 | 20 6f 74 68 65 72 2d 77 |o-buffer| other-w|
|00001850| 69 6e 64 6f 77 20 73 65 | 6c 65 63 74 2d 77 69 6e |indow se|lect-win|
|00001860| 64 6f 77 20 70 72 65 76 | 69 6f 75 73 2d 77 69 6e |dow prev|ious-win|
|00001870| 64 6f 77 20 74 68 69 73 | 2d 63 6f 6d 6d 61 6e 64 |dow this|-command|
|00001880| 20 65 64 69 66 66 2d 71 | 75 69 74 20 65 72 72 6f | ediff-q|uit erro|
|00001890| 72 20 65 64 69 66 66 2d | 4b 49 4c 4c 45 44 2d 56 |r ediff-|KILLED-V|
|000018a0| 49 54 41 4c 2d 42 55 46 | 46 45 52 20 65 64 69 66 |ITAL-BUF|FER edif|
|000018b0| 66 2d 6d 61 70 2d 70 61 | 74 63 68 2d 62 75 66 66 |f-map-pa|tch-buff|
|000018c0| 65 72 5d 20 35 20 28 23 | 24 20 2e 20 35 35 36 34 |er] 5 (#|$ . 5564|
|000018d0| 29 5d 29 0a 28 64 65 66 | 61 6c 69 61 73 20 27 65 |)]).(def|alias 'e|
|000018e0| 64 69 66 66 2d 64 69 73 | 70 61 74 63 68 2d 66 69 |diff-dis|patch-fi|
|000018f0| 6c 65 2d 70 61 74 63 68 | 69 6e 67 2d 6a 6f 62 20 |le-patch|ing-job |
|00001900| 23 5b 28 70 61 74 63 68 | 2d 62 75 66 20 66 69 6c |#[(patch|-buf fil|
|00001910| 65 6e 61 6d 65 20 26 6f | 70 74 69 6f 6e 61 6c 20 |ename &o|ptional |
|00001920| 73 74 61 72 74 75 70 2d | 68 6f 6f 6b 73 29 20 22 |startup-|hooks) "|
|00001930| 70 18 09 83 54 00 c2 09 | 21 83 54 00 c3 c2 09 21 |p...T...|!.T....!|
|00001940| 21 83 54 00 c4 8e 09 71 | 88 c5 0e 06 21 88 0e 07 |!.T....q|....!...|
|00001950| 47 c8 57 83 4b 00 c9 09 | ca cb 0e 07 40 40 5c 22 |G.W.K...|....@@\"|
|00001960| 84 43 00 0e 07 40 40 47 | cc 56 83 43 00 0e 07 40 |.C...@@G|.V.C...@|
|00001970| 40 82 45 00 0e 06 0e 0d | 23 82 50 00 ce 09 0e 0d |@.E.....|#.P.....|
|00001980| 5c 22 29 82 5f 00 0e 0f | d0 3d 86 5f 00 d1 0e 12 |\")._...|.=._....|
|00001990| 21 29 87 22 20 5b 53 74 | 61 72 74 42 75 66 66 65 |!)." [St|artBuffe|
|000019a0| 72 20 70 61 74 63 68 2d | 62 75 66 20 67 65 74 2d |r patch-|buf get-|
|000019b0| 62 75 66 66 65 72 20 62 | 75 66 66 65 72 2d 6e 61 |buffer b|uffer-na|
|000019c0| 6d 65 20 28 28 73 65 74 | 2d 62 75 66 66 65 72 20 |me ((set|-buffer |
|000019d0| 53 74 61 72 74 42 75 66 | 66 65 72 29 29 20 65 64 |StartBuf|fer)) ed|
|000019e0| 69 66 66 2d 66 69 78 75 | 70 2d 70 61 74 63 68 2d |iff-fixu|p-patch-|
|000019f0| 6d 61 70 20 66 69 6c 65 | 6e 61 6d 65 20 65 64 69 |map file|name edi|
|00001a00| 66 66 2d 70 61 74 63 68 | 2d 6d 61 70 20 32 20 65 |ff-patch|-map 2 e|
|00001a10| 64 69 66 66 2d 70 61 74 | 63 68 2d 66 69 6c 65 2d |diff-pat|ch-file-|
|00001a20| 69 6e 74 65 72 6e 61 6c | 20 73 74 72 69 6e 67 2d |internal| string-|
|00001a30| 6d 61 74 63 68 20 22 5e | 2f 64 65 76 2f 6e 75 6c |match "^|/dev/nul|
|00001a40| 6c 22 20 31 20 73 74 61 | 72 74 75 70 2d 68 6f 6f |l" 1 sta|rtup-hoo|
|00001a50| 6b 73 20 65 64 69 66 66 | 2d 6d 75 6c 74 69 2d 70 |ks ediff|-multi-p|
|00001a60| 61 74 63 68 2d 69 6e 74 | 65 72 6e 61 6c 20 74 68 |atch-int|ernal th|
|00001a70| 69 73 2d 63 6f 6d 6d 61 | 6e 64 20 65 64 69 66 66 |is-comma|nd ediff|
|00001a80| 2d 71 75 69 74 20 65 72 | 72 6f 72 20 65 64 69 66 |-quit er|ror edif|
|00001a90| 66 2d 4b 49 4c 4c 45 44 | 2d 56 49 54 41 4c 2d 42 |f-KILLED|-VITAL-B|
|00001aa0| 55 46 46 45 52 5d 20 35 | 5d 29 0a 28 64 65 66 61 |UFFER] 5|]).(defa|
|00001ab0| 6c 69 61 73 20 27 65 64 | 69 66 66 2d 70 61 74 63 |lias 'ed|iff-patc|
|00001ac0| 68 2d 62 75 66 66 65 72 | 2d 69 6e 74 65 72 6e 61 |h-buffer|-interna|
|00001ad0| 6c 20 23 5b 28 70 61 74 | 63 68 2d 62 75 66 20 62 |l #[(pat|ch-buf b|
|00001ae0| 75 66 2d 74 6f 2d 70 61 | 74 63 68 2d 6e 61 6d 65 |uf-to-pa|tch-name|
|00001af0| 20 26 6f 70 74 69 6f 6e | 61 6c 20 73 74 61 72 74 | &option|al start|
|00001b00| 75 70 2d 68 6f 6f 6b 73 | 29 20 22 c0 09 21 89 1a |up-hooks|) "..!..|
|00001b10| 85 0b 00 c3 5c 6e 21 1c | c5 5c 6e 21 1e 06 70 1e |....\n!.|.\n!..p.|
|00001b20| 07 0e 08 83 35 00 c0 0e | 08 21 83 35 00 c9 c0 0e |....5...|.!.5....|
|00001b30| 08 21 21 83 35 00 ca 8e | 0e 08 71 88 0e 0b 29 82 |.!!.5...|..q...).|
|00001b40| 40 00 0e 5c 66 cd 3d 86 | 40 00 ce 0e 0f 21 29 47 |@..\f.=.|@....!)G|
|00001b50| d0 56 1e 11 d2 1e 13 d2 | 1e 14 d2 1e 15 5c 66 83 |.V......|.....\f.|
|00001b60| 59 00 5c 66 16 14 82 ad | 00 0e 11 83 62 00 ce d6 |Y.\f....|....b...|
|00001b70| 21 88 70 1e 07 5c 6e 83 | a0 00 c0 5c 6e 21 83 a0 |!.p..\n.|...\n!..|
|00001b80| 00 c9 c0 5c 6e 21 21 83 | a0 00 d7 8e 5c 6e 71 88 |...\n!!.|....\nq.|
|00001b90| 0e 18 16 13 d9 5c 6e 21 | 16 14 da 0e 14 21 88 d2 |.....\n!|.....!..|
|00001ba0| 16 1b dc 09 21 88 dd d2 | 21 88 de 20 88 0e 13 16 |....!...|!.. ....|
|00001bb0| 18 29 82 ac 00 0e 5c 66 | cd 3d 84 ac 00 ce 0e 0f |.)....\f|.=......|
|00001bc0| 21 88 29 df 0e 08 0e 14 | 0e 20 23 16 15 5c 66 3f |!.).....|. #..\f?|
|00001bd0| 85 86 01 70 1e 07 0e 15 | 83 7a 01 c0 0e 15 21 83 |...p....|.z....!.|
|00001be0| 7a 01 c9 c0 0e 15 21 21 | 83 7a 01 e1 8e 0e 15 71 |z.....!!|.z.....q|
|00001bf0| 88 e2 c3 0e 23 21 21 88 | e2 c3 0e 24 21 21 88 70 |....#!!.|...$!!.p|
|00001c00| 1e 07 0e 23 83 20 01 c0 | 0e 23 21 83 20 01 c9 c0 |...#. ..|.#!. ...|
|00001c10| 0e 23 21 21 83 20 01 e5 | 8e 0e 23 71 88 0e 13 83 |.#!!. ..|..#q....|
|00001c20| 0f 01 0e 13 16 18 da d2 | 21 88 dc 09 21 88 dd 0e |........|!...!...|
|00001c30| 06 21 88 29 82 2c 01 0e | 5c 66 cd 3d 84 2c 01 ce |.!.).,..|\f.=.,..|
|00001c40| 0e 0f 21 88 29 70 1e 07 | 0e 24 83 6b 01 c0 0e 24 |..!.)p..|.$.k...$|
|00001c50| 21 83 6b 01 c9 c0 0e 24 | 21 21 83 6b 01 e6 8e 0e |!.k....$|!!.k....|
|00001c60| 24 71 88 d2 16 1b 0e 13 | 83 57 01 0e 13 16 18 da |$q......|.W......|
|00001c70| d2 21 88 dc e7 09 e8 50 | e9 5c 22 21 88 dd ea 21 |.!.....P|.\"!...!|
|00001c80| 29 82 76 01 0e 5c 66 cd | 3d 86 76 01 ce 0e 0f 21 |).v..\f.|=.v....!|
|00001c90| 2a 82 85 01 0e 5c 66 cd | 3d 86 85 01 ce 0e 0f 21 |*....\f.|=......!|
|00001ca0| 29 2e 07 87 22 20 5b 67 | 65 74 2d 62 75 66 66 65 |)..." [g|et-buffe|
|00001cb0| 72 20 62 75 66 2d 74 6f | 2d 70 61 74 63 68 2d 6e |r buf-to|-patch-n|
|00001cc0| 61 6d 65 20 62 75 66 2d | 74 6f 2d 70 61 74 63 68 |ame buf-|to-patch|
|00001cd0| 20 62 75 66 66 65 72 2d | 66 69 6c 65 2d 6e 61 6d | buffer-|file-nam|
|00001ce0| 65 20 66 69 6c 65 2d 6e | 61 6d 65 2d 6f 6b 20 62 |e file-n|ame-ok b|
|00001cf0| 75 66 66 65 72 2d 6d 6f | 64 69 66 69 65 64 2d 70 |uffer-mo|dified-p|
|00001d00| 20 62 75 66 2d 6d 6f 64 | 2d 73 74 61 74 75 73 20 | buf-mod|-status |
|00001d10| 53 74 61 72 74 42 75 66 | 66 65 72 20 70 61 74 63 |StartBuf|fer patc|
|00001d20| 68 2d 62 75 66 20 62 75 | 66 66 65 72 2d 6e 61 6d |h-buf bu|ffer-nam|
|00001d30| 65 20 28 28 73 65 74 2d | 62 75 66 66 65 72 20 53 |e ((set-|buffer S|
|00001d40| 74 61 72 74 42 75 66 66 | 65 72 29 29 20 65 64 69 |tartBuff|er)) edi|
|00001d50| 66 66 2d 70 61 74 63 68 | 2d 6d 61 70 20 74 68 69 |ff-patch|-map thi|
|00001d60| 73 2d 63 6f 6d 6d 61 6e | 64 20 65 64 69 66 66 2d |s-comman|d ediff-|
|00001d70| 71 75 69 74 20 65 72 72 | 6f 72 20 65 64 69 66 66 |quit err|or ediff|
|00001d80| 2d 4b 49 4c 4c 45 44 2d | 56 49 54 41 4c 2d 42 55 |-KILLED-|VITAL-BU|
|00001d90| 46 46 45 52 20 31 20 6d | 75 6c 74 69 66 69 6c 65 |FFER 1 m|ultifile|
|00001da0| 2d 70 61 74 63 68 2d 70 | 20 6e 69 6c 20 64 65 66 |-patch-p| nil def|
|00001db0| 61 75 6c 74 2d 64 69 72 | 20 66 69 6c 65 2d 6e 61 |ault-dir| file-na|
|00001dc0| 6d 65 20 63 74 6c 2d 62 | 75 66 20 22 43 61 6e 27 |me ctl-b|uf "Can'|
|00001dd0| 74 20 61 70 70 6c 79 20 | 6d 75 6c 74 69 2d 66 69 |t apply |multi-fi|
|00001de0| 6c 65 20 70 61 74 63 68 | 65 73 20 74 6f 20 62 75 |le patch|es to bu|
|00001df0| 66 66 65 72 73 20 74 68 | 61 74 20 76 69 73 69 74 |ffers th|at visit|
|00001e00| 20 6e 6f 20 66 69 6c 65 | 73 22 20 28 28 73 65 74 | no file|s" ((set|
|00001e10| 2d 62 75 66 66 65 72 20 | 53 74 61 72 74 42 75 66 |-buffer |StartBuf|
|00001e20| 66 65 72 29 29 20 64 65 | 66 61 75 6c 74 2d 64 69 |fer)) de|fault-di|
|00001e30| 72 65 63 74 6f 72 79 20 | 65 64 69 66 66 2d 6d 61 |rectory |ediff-ma|
|00001e40| 6b 65 2d 74 65 6d 70 2d | 66 69 6c 65 20 73 65 74 |ke-temp-|file set|
|00001e50| 2d 76 69 73 69 74 65 64 | 2d 66 69 6c 65 2d 6e 61 |-visited|-file-na|
|00001e60| 6d 65 20 62 75 66 66 65 | 72 2d 61 75 74 6f 2d 73 |me buffe|r-auto-s|
|00001e70| 61 76 65 2d 66 69 6c 65 | 2d 6e 61 6d 65 20 72 65 |ave-file|-name re|
|00001e80| 6e 61 6d 65 2d 62 75 66 | 66 65 72 20 73 65 74 2d |name-buf|fer set-|
|00001e90| 62 75 66 66 65 72 2d 6d | 6f 64 69 66 69 65 64 2d |buffer-m|odified-|
|00001ea0| 70 20 73 65 74 2d 76 69 | 73 69 74 65 64 2d 66 69 |p set-vi|sited-fi|
|00001eb0| 6c 65 2d 6d 6f 64 74 69 | 6d 65 20 65 64 69 66 66 |le-modti|me ediff|
|00001ec0| 2d 64 69 73 70 61 74 63 | 68 2d 66 69 6c 65 2d 70 |-dispatc|h-file-p|
|00001ed0| 61 74 63 68 69 6e 67 2d | 6a 6f 62 20 73 74 61 72 |atching-|job star|
|00001ee0| 74 75 70 2d 68 6f 6f 6b | 73 20 28 28 73 65 74 2d |tup-hook|s ((set-|
|00001ef0| 62 75 66 66 65 72 20 53 | 74 61 72 74 42 75 66 66 |buffer S|tartBuff|
|00001f00| 65 72 29 29 20 64 65 6c | 65 74 65 2d 66 69 6c 65 |er)) del|ete-file|
|00001f10| 20 65 64 69 66 66 2d 62 | 75 66 66 65 72 2d 41 20 | ediff-b|uffer-A |
|00001f20| 65 64 69 66 66 2d 62 75 | 66 66 65 72 2d 42 20 28 |ediff-bu|ffer-B (|
|00001f30| 28 73 65 74 2d 62 75 66 | 66 65 72 20 53 74 61 72 |(set-buf|fer Star|
|00001f40| 74 42 75 66 66 65 72 29 | 29 20 28 28 73 65 74 2d |tBuffer)|) ((set-|
|00001f50| 62 75 66 66 65 72 20 53 | 74 61 72 74 42 75 66 66 |buffer S|tartBuff|
|00001f60| 65 72 29 29 20 65 64 69 | 66 66 2d 75 6e 69 71 75 |er)) edi|ff-uniqu|
|00001f70| 65 2d 62 75 66 66 65 72 | 2d 6e 61 6d 65 20 22 5f |e-buffer|-name "_|
|00001f80| 70 61 74 63 68 65 64 22 | 20 22 22 20 74 5d 20 35 |patched"| "" t] 5|
|00001f90| 5d 29 0a 28 64 65 66 61 | 6c 69 61 73 20 27 65 64 |]).(defa|lias 'ed|
|00001fa0| 69 66 66 2d 70 61 74 63 | 68 2d 66 69 6c 65 2d 69 |iff-patc|h-file-i|
|00001fb0| 6e 74 65 72 6e 61 6c 20 | 23 5b 28 70 61 74 63 68 |nternal |#[(patch|
|00001fc0| 2d 62 75 66 20 73 6f 75 | 72 63 65 2d 66 69 6c 65 |-buf sou|rce-file|
|00001fd0| 6e 61 6d 65 20 26 6f 70 | 74 69 6f 6e 61 6c 20 73 |name &op|tional s|
|00001fe0| 74 61 72 74 75 70 2d 68 | 6f 6f 6b 73 29 20 22 c0 |tartup-h|ooks) ".|
|00001ff0| 09 21 11 5c 6e c3 c4 5c | 6e 5c 22 83 11 00 c5 95 |.!.\n..\|n\".....|
|00002000| 82 12 00 c5 c3 c6 5c 6e | 5c 22 83 1e 00 c5 95 82 |......\n|\"......|
|00002010| 1f 00 c5 4f 1e 07 0e 08 | 1e 09 ca cb 21 1e 5c 66 |...O....|....!.\f|
|00002020| 09 1e 0d 09 1e 0e cf 1e | 10 cf 1e 11 cf 1e 12 cf |........|........|
|00002030| 1e 13 cf 1e 14 0e 07 d5 | 98 83 4b 00 0e 16 16 07 |........|..K.....|
|00002040| c3 d7 5c 6e 5c 22 83 56 | 00 d8 d9 21 88 da cd d1 |..\n\".V|...!....|
|00002050| db dc 24 88 dd 0e 0d 21 | dd 09 21 9a 3f 16 12 de |..$....!|..!.?...|
|00002060| df 0e 11 21 21 83 76 00 | e0 0e 11 21 88 70 1e 21 |...!!.v.|...!.p.!|
|00002070| 0e 5c 66 83 c3 00 e2 0e | 5c 66 21 83 c3 00 e3 e2 |.\f.....|\f!.....|
|00002080| 0e 5c 66 21 21 83 c3 00 | e4 8e 0e 5c 66 71 88 e5 |.\f!!...|...\fq..|
|00002090| 0e 26 21 88 e7 e8 21 88 | e9 ea 21 16 14 eb ea cf |.&!...!.|..!.....|
|000020a0| 5c 22 88 ec 65 64 ed ee | 0e 2f 5c 6e 0e 07 c0 0e |\"..ed..|./\n....|
|000020b0| 0d 21 25 f0 24 88 eb ea | 0e 14 5c 22 88 29 82 cf |.!%.$...|..\".)..|
|000020c0| 00 0e 31 f2 3d 84 cf 00 | d8 0e 33 21 88 29 e7 f4 |..1.=...|..3!.)..|
|000020d0| 21 88 e7 d5 21 88 f5 0e | 5c 66 21 88 f6 c5 21 88 |!...!...|\f!...!.|
|000020e0| f7 0e 0d 0e 07 50 21 84 | ef 00 d8 f8 21 88 0e 12 |.....P!.|....!...|
|000020f0| 84 31 01 70 1e 21 0e 11 | 83 21 01 e2 0e 11 21 83 |.1.p.!..|.!....!.|
|00002100| 21 01 e3 e2 0e 11 21 21 | 83 21 01 f9 8e 0e 11 71 |!.....!!|.!.....q|
|00002110| 88 fa 09 0e 07 50 21 88 | fb cf 21 88 29 82 2d 01 |.....P!.|..!.).-.|
|00002120| 0e 31 f2 3d 84 2d 01 d8 | 0e 33 21 88 29 82 67 01 |.1.=.-..|.3!.).g.|
|00002130| dd 09 21 1e 3c fd 0e 3e | 21 85 42 01 0e 3e 0e 3c |..!.<..>|!.B..>.<|
|00002140| 21 29 83 4b 01 0e 0d 82 | 4c 01 09 ff 50 16 0e 81 |!).K....|L...P...|
|00002150| 40 00 0e 0d 0e 0e f0 23 | 88 81 40 00 0e 0d 0e 07 |@......#|..@.....|
|00002160| 50 0e 0d f0 23 88 81 41 | 00 0e 1c 42 16 1c 81 42 |P...#..A|...B...B|
|00002170| 00 0e 0e 21 16 10 81 43 | 00 0e 11 0e 10 cf 0e 1c |...!...C|........|
|00002180| 81 44 00 25 16 13 70 1e | 21 0e 13 83 b3 01 e2 0e |.D.%..p.|!.......|
|00002190| 13 21 83 b3 01 e3 e2 0e | 13 21 21 83 b3 01 81 45 |.!......|.!!....E|
|000021a0| 00 8e 0e 13 71 88 0e 26 | 16 46 0e 5c 66 16 47 29 |....q..&|.F.\f.G)|
|000021b0| 82 bf 01 0e 31 f2 3d 84 | bf 01 d8 0e 33 21 88 29 |....1.=.|....3!.)|
|000021c0| 81 48 00 0e 5c 66 21 88 | e7 81 49 00 21 88 0e 13 |.H..\f!.|..I.!...|
|000021d0| 2e 5c 6e 87 22 20 5b 65 | 78 70 61 6e 64 2d 66 69 |.\n." [e|xpand-fi|
|000021e0| 6c 65 2d 6e 61 6d 65 20 | 73 6f 75 72 63 65 2d 66 |le-name |source-f|
|000021f0| 69 6c 65 6e 61 6d 65 20 | 65 64 69 66 66 2d 70 61 |ilename |ediff-pa|
|00002200| 74 63 68 2d 6f 70 74 69 | 6f 6e 73 20 73 74 72 69 |tch-opti|ons stri|
|00002210| 6e 67 2d 6d 61 74 63 68 | 20 22 2d 62 5b 20 09 5d |ng-match| "-b[ .]|
|00002220| 2b 22 20 30 20 22 2d 62 | 5b 20 09 5d 2b 5b 5e 20 |+" 0 "-b|[ .]+[^ |
|00002230| 09 5d 2b 22 20 62 61 63 | 6b 75 70 2d 65 78 74 65 |.]+" bac|kup-exte|
|00002240| 6e 73 69 6f 6e 20 65 64 | 69 66 66 2d 73 68 65 6c |nsion ed|iff-shel|
|00002250| 6c 20 73 68 65 6c 6c 2d | 66 69 6c 65 2d 6e 61 6d |l shell-|file-nam|
|00002260| 65 20 67 65 74 2d 62 75 | 66 66 65 72 2d 63 72 65 |e get-bu|ffer-cre|
|00002270| 61 74 65 20 22 2a 65 64 | 69 66 66 20 70 61 74 63 |ate "*ed|iff patc|
|00002280| 68 20 64 69 61 67 6e 6f | 73 74 69 63 73 2a 22 20 |h diagno|stics*" |
|00002290| 70 61 74 63 68 2d 64 69 | 61 67 6e 6f 73 74 69 63 |patch-di|agnostic|
|000022a0| 73 20 74 72 75 65 2d 73 | 6f 75 72 63 65 2d 66 69 |s true-s|ource-fi|
|000022b0| 6c 65 6e 61 6d 65 20 74 | 61 72 67 65 74 2d 66 69 |lename t|arget-fi|
|000022c0| 6c 65 6e 61 6d 65 20 6e | 69 6c 20 74 61 72 67 65 |lename n|il targe|
|000022d0| 74 2d 62 75 66 20 62 75 | 66 2d 74 6f 2d 70 61 74 |t-buf bu|f-to-pat|
|000022e0| 63 68 20 66 69 6c 65 2d | 6e 61 6d 65 2d 6d 61 67 |ch file-|name-mag|
|000022f0| 69 63 2d 70 20 63 74 6c | 2d 62 75 66 20 62 61 63 |ic-p ctl|-buf bac|
|00002300| 6b 75 70 2d 73 74 79 6c | 65 20 22 22 20 65 64 69 |kup-styl|e "" edi|
|00002310| 66 66 2d 62 61 63 6b 75 | 70 2d 65 78 74 65 6e 73 |ff-backu|p-extens|
|00002320| 69 6f 6e 20 22 2d 56 22 | 20 65 72 72 6f 72 20 22 |ion "-V"| error "|
|00002330| 45 64 69 66 66 20 64 6f | 65 73 6e 27 74 20 74 61 |Ediff do|esn't ta|
|00002340| 6b 65 20 74 68 65 20 2d | 56 20 6f 70 74 69 6f 6e |ke the -|V option|
|00002350| 20 69 6e 20 60 65 64 69 | 66 66 2d 70 61 74 63 68 | in `edi|ff-patch|
|00002360| 2d 6f 70 74 69 6f 6e 73 | 27 2d 2d 73 6f 72 72 79 |-options|'--sorry|
|00002370| 22 20 65 64 69 66 66 2d | 66 69 6e 64 2d 66 69 6c |" ediff-|find-fil|
|00002380| 65 20 65 64 69 66 66 2d | 6c 61 73 74 2d 64 69 72 |e ediff-|last-dir|
|00002390| 2d 70 61 74 63 68 20 73 | 74 61 72 74 75 70 2d 68 |-patch s|tartup-h|
|000023a0| 6f 6f 6b 73 20 66 69 6c | 65 2d 74 72 75 65 6e 61 |ooks fil|e-truena|
|000023b0| 6d 65 20 65 64 69 66 66 | 2d 66 69 6c 65 2d 63 68 |me ediff|-file-ch|
|000023c0| 65 63 6b 65 64 2d 69 6e | 2d 70 20 62 75 66 66 65 |ecked-in|-p buffe|
|000023d0| 72 2d 66 69 6c 65 2d 6e | 61 6d 65 20 65 64 69 66 |r-file-n|ame edif|
|000023e0| 66 2d 74 6f 67 67 6c 65 | 2d 72 65 61 64 2d 6f 6e |f-toggle|-read-on|
|000023f0| 6c 79 20 53 74 61 72 74 | 42 75 66 66 65 72 20 67 |ly Start|Buffer g|
|00002400| 65 74 2d 62 75 66 66 65 | 72 20 62 75 66 66 65 72 |et-buffe|r buffer|
|00002410| 2d 6e 61 6d 65 20 28 28 | 73 65 74 2d 62 75 66 66 |-name ((|set-buff|
|00002420| 65 72 20 53 74 61 72 74 | 42 75 66 66 65 72 29 29 |er Start|Buffer))|
|00002430| 20 69 6e 73 65 72 74 2d | 62 75 66 66 65 72 20 70 | insert-|buffer p|
|00002440| 61 74 63 68 2d 62 75 66 | 20 6d 65 73 73 61 67 65 |atch-buf| message|
|00002450| 20 22 41 70 70 6c 79 69 | 6e 67 20 70 61 74 63 68 | "Applyi|ng patch|
|00002460| 20 2e 2e 2e 20 22 20 67 | 65 74 65 6e 76 20 22 56 | ... " g|etenv "V|
|00002470| 45 52 53 49 4f 4e 5f 43 | 4f 4e 54 52 4f 4c 22 20 |ERSION_C|ONTROL" |
|00002480| 73 65 74 65 6e 76 20 73 | 68 65 6c 6c 2d 63 6f 6d |setenv s|hell-com|
|00002490| 6d 61 6e 64 2d 6f 6e 2d | 72 65 67 69 6f 6e 20 66 |mand-on-|region f|
|000024a0| 6f 72 6d 61 74 20 22 25 | 73 20 2d 66 20 25 73 20 |ormat "%|s -f %s |
|000024b0| 2d 62 20 25 73 20 25 73 | 22 20 65 64 69 66 66 2d |-b %s %s|" ediff-|
|000024c0| 70 61 74 63 68 2d 70 72 | 6f 67 72 61 6d 20 74 20 |patch-pr|ogram t |
|000024d0| 74 68 69 73 2d 63 6f 6d | 6d 61 6e 64 20 65 64 69 |this-com|mand edi|
|000024e0| 66 66 2d 71 75 69 74 20 | 65 64 69 66 66 2d 4b 49 |ff-quit |ediff-KI|
|000024f0| 4c 4c 45 44 2d 56 49 54 | 41 4c 2d 42 55 46 46 45 |LLED-VIT|AL-BUFFE|
|00002500| 52 20 22 41 70 70 6c 79 | 69 6e 67 20 70 61 74 63 |R "Apply|ing patc|
|00002510| 68 20 2e 2e 2e 20 64 6f | 6e 65 22 20 73 77 69 74 |h ... do|ne" swit|
|00002520| 63 68 2d 74 6f 2d 62 75 | 66 66 65 72 20 73 69 74 |ch-to-bu|ffer sit|
|00002530| 2d 66 6f 72 20 66 69 6c | 65 2d 65 78 69 73 74 73 |-for fil|e-exists|
|00002540| 2d 70 20 22 50 61 74 63 | 68 20 61 70 70 65 61 72 |-p "Patc|h appear|
|00002550| 73 20 74 6f 20 68 61 76 | 65 20 66 61 69 6c 65 64 |s to hav|e failed|
|00002560| 22 20 28 28 73 65 74 2d | 62 75 66 66 65 72 20 53 |" ((set-|buffer S|
|00002570| 74 61 72 74 42 75 66 66 | 65 72 29 29 20 73 65 74 |tartBuff|er)) set|
|00002580| 2d 76 69 73 69 74 65 64 | 2d 66 69 6c 65 2d 6e 61 |-visited|-file-na|
|00002590| 6d 65 20 73 65 74 2d 62 | 75 66 66 65 72 2d 6d 6f |me set-b|uffer-mo|
|000025a0| 64 69 66 69 65 64 2d 70 | 20 66 69 6c 65 2d 6e 61 |dified-p| file-na|
|000025b0| 6d 65 20 66 62 6f 75 6e | 64 70 20 65 64 69 66 66 |me fboun|dp ediff|
|000025c0| 2d 61 6e 67 65 2d 66 74 | 70 2d 66 74 70 2d 6e 61 |-ange-ft|p-ftp-na|
|000025d0| 6d 65 20 22 5f 70 61 74 | 63 68 65 64 22 20 72 65 |me "_pat|ched" re|
|000025e0| 6e 61 6d 65 2d 66 69 6c | 65 20 65 64 69 66 66 2d |name-fil|e ediff-|
|000025f0| 73 65 74 2d 72 65 61 64 | 2d 6f 6e 6c 79 2d 69 6e |set-read|-only-in|
|00002600| 2d 62 75 66 2d 41 20 66 | 69 6e 64 2d 66 69 6c 65 |-buf-A f|ind-file|
|00002610| 2d 6e 6f 73 65 6c 65 63 | 74 20 65 64 69 66 66 2d |-noselec|t ediff-|
|00002620| 62 75 66 66 65 72 73 2d | 69 6e 74 65 72 6e 61 6c |buffers-|internal|
|00002630| 20 65 70 61 74 63 68 20 | 28 28 73 65 74 2d 62 75 | epatch |((set-bu|
|00002640| 66 66 65 72 20 53 74 61 | 72 74 42 75 66 66 65 72 |ffer Sta|rtBuffer|
|00002650| 29 29 20 65 64 69 66 66 | 2d 70 61 74 63 68 62 75 |)) ediff|-patchbu|
|00002660| 66 65 72 20 65 64 69 66 | 66 2d 70 61 74 63 68 2d |fer edif|f-patch-|
|00002670| 64 69 61 67 6e 6f 73 74 | 69 63 73 20 62 75 72 79 |diagnost|ics bury|
|00002680| 2d 62 75 66 66 65 72 20 | 22 54 79 70 65 20 60 50 |-buffer |"Type `P|
|00002690| 27 2c 20 69 66 20 79 6f | 75 20 6e 65 65 64 20 74 |', if yo|u need t|
|000026a0| 6f 20 73 65 65 20 70 61 | 74 63 68 20 64 69 61 67 |o see pa|tch diag|
|000026b0| 6e 6f 73 74 69 63 73 22 | 5d 20 31 30 5d 29 0a 28 |nostics"|] 10]).(|
|000026c0| 64 65 66 61 6c 69 61 73 | 20 27 65 64 69 66 66 2d |defalias| 'ediff-|
|000026d0| 6d 75 6c 74 69 2d 70 61 | 74 63 68 2d 69 6e 74 65 |multi-pa|tch-inte|
|000026e0| 72 6e 61 6c 20 23 5b 28 | 70 61 74 63 68 2d 62 75 |rnal #[(|patch-bu|
|000026f0| 66 20 26 6f 70 74 69 6f | 6e 61 6c 20 73 74 61 72 |f &optio|nal star|
|00002700| 74 75 70 2d 68 6f 6f 6b | 73 29 20 22 c0 19 c2 0b |tup-hook|s) "....|
|00002710| 42 13 c4 c5 70 1e 06 0e | 07 83 34 00 c8 0e 07 21 |B...p...|..4....!|
|00002720| 83 34 00 c9 c8 0e 07 21 | 21 83 34 00 ca 8e 0e 07 |.4.....!|!.4.....|
|00002730| 71 88 c0 cb cc 0e 07 5c | 22 44 0e 0d 29 42 82 3f |q......\|"D..)B.?|
|00002740| 00 0e 0e cf 3d 86 3f 00 | d0 0e 11 21 29 d2 d3 d4 |....=.?.|...!)...|
|00002750| 0b 26 06 11 d5 09 21 29 | 87 22 20 5b 6e 69 6c 20 |.&....!)|." [nil |
|00002760| 6d 65 74 61 2d 62 75 66 | 20 28 6c 61 6d 62 64 61 |meta-buf| (lambda|
|00002770| 20 6e 69 6c 20 28 73 65 | 74 71 20 65 64 69 66 66 | nil (se|tq ediff|
|00002780| 2d 73 65 73 73 69 6f 6e | 2d 61 63 74 69 6f 6e 2d |-session|-action-|
|00002790| 66 75 6e 63 74 69 6f 6e | 20 28 71 75 6f 74 65 20 |function| (quote |
|000027a0| 65 64 69 66 66 2d 70 61 | 74 63 68 2d 66 69 6c 65 |ediff-pa|tch-file|
|000027b0| 2d 66 6f 72 6d 2d 6d 65 | 74 61 29 20 65 64 69 66 |-form-me|ta) edif|
|000027c0| 66 2d 6d 65 74 61 2d 70 | 61 74 63 68 62 75 66 65 |f-meta-p|atchbufe|
|000027d0| 72 20 70 61 74 63 68 2d | 62 75 66 29 29 20 73 74 |r patch-|buf)) st|
|000027e0| 61 72 74 75 70 2d 68 6f | 6f 6b 73 20 65 64 69 66 |artup-ho|oks edif|
|000027f0| 66 2d 70 72 65 70 61 72 | 65 2d 6d 65 74 61 2d 62 |f-prepar|e-meta-b|
|00002800| 75 66 66 65 72 20 65 64 | 69 66 66 2d 66 69 6c 65 |uffer ed|iff-file|
|00002810| 67 72 6f 75 70 2d 61 63 | 74 69 6f 6e 20 53 74 61 |group-ac|tion Sta|
|00002820| 72 74 42 75 66 66 65 72 | 20 70 61 74 63 68 2d 62 |rtBuffer| patch-b|
|00002830| 75 66 20 67 65 74 2d 62 | 75 66 66 65 72 20 62 75 |uf get-b|uffer bu|
|00002840| 66 66 65 72 2d 6e 61 6d | 65 20 28 28 73 65 74 2d |ffer-nam|e ((set-|
|00002850| 62 75 66 66 65 72 20 53 | 74 61 72 74 42 75 66 66 |buffer S|tartBuff|
|00002860| 65 72 29 29 20 66 6f 72 | 6d 61 74 20 22 25 53 22 |er)) for|mat "%S"|
|00002870| 20 65 64 69 66 66 2d 70 | 61 74 63 68 2d 6d 61 70 | ediff-p|atch-map|
|00002880| 20 74 68 69 73 2d 63 6f | 6d 6d 61 6e 64 20 65 64 | this-co|mmand ed|
|00002890| 69 66 66 2d 71 75 69 74 | 20 65 72 72 6f 72 20 65 |iff-quit| error e|
|000028a0| 64 69 66 66 2d 4b 49 4c | 4c 45 44 2d 56 49 54 41 |diff-KIL|LED-VITA|
|000028b0| 4c 2d 42 55 46 46 45 52 | 20 22 2a 45 64 69 66 66 |L-BUFFER| "*Ediff|
|000028c0| 20 53 65 73 73 69 6f 6e | 20 47 72 6f 75 70 20 50 | Session| Group P|
|000028d0| 61 6e 65 6c 22 20 65 64 | 69 66 66 2d 72 65 64 72 |anel" ed|iff-redr|
|000028e0| 61 77 2d 64 69 72 65 63 | 74 6f 72 79 2d 67 72 6f |aw-direc|tory-gro|
|000028f0| 75 70 2d 62 75 66 66 65 | 72 20 65 64 69 66 66 2d |up-buffe|r ediff-|
|00002900| 6d 75 6c 74 69 66 69 6c | 65 2d 70 61 74 63 68 20 |multifil|e-patch |
|00002910| 65 64 69 66 66 2d 73 68 | 6f 77 2d 6d 65 74 61 2d |ediff-sh|ow-meta-|
|00002920| 62 75 66 66 65 72 5d 20 | 37 5d 29 0a 28 70 72 6f |buffer] |7]).(pro|
|00002930| 76 69 64 65 20 28 71 75 | 6f 74 65 20 65 64 69 66 |vide (qu|ote edif|
|00002940| 66 2d 70 74 63 68 29 29 | 0a                      |f-ptch))|.       |
+--------+-------------------------+-------------------------+--------+--------+